Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 11 Feb 2010 21:54:28 +0000 (21:54 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 11 Feb 2010 21:54:28 +0000 (21:54 +0000)
commit4077814631e8777c03c88827a2ecaa1fe7d5a801
tree34a13e91dc1083ff1584214a182cec7e52d63904
parent2e077c8c2b6f613c26b3f98594d90aada56cb4cc
parentbda0967c5bc41b447334544280ee3841c3db26f5
Merge from mainline.